Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 11:57:09 +0000 (06:57 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 11:57:09 +0000 (06:57 -0500)
commiteae2c83f56304150752c9e80516871d7b3d77956
tree297823e84dcc1bc367ad3b564f5ad31d869c5143
parent7b48b919e45393bf4977436adb7cf9329ed85fcd
parentdfa13261c96e31c2be6b8eaff407b0de2b60956c
Merge from mainline.
src/Makefile.in
src/buffer.c
src/buffer.h
src/dispextern.h
src/dispnew.c
src/term.c
src/window.h
src/xdisp.c